Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses client / src / common / OwnerInterface.java

diff --git a/ruralHouses client/src/common/OwnerInterface.java b/ruralHouses client/src/common/OwnerInterface.java
new file mode 100644 (file)
index 0000000..c96e013
--- /dev/null
+++ b/ruralHouses client/src/common/OwnerInterface.java
@@ -0,0 +1,15 @@
+package common;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.util.Vector;
+
+import domain.Owner;
+
+public interface OwnerInterface extends Remote {
+
+
+       public Vector<Owner> getOwners() throws RemoteException,
+       Exception;
+       
+}